From 30efeb1f90e4f1f8d17fde3430a08b0f0b8ea77a Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 12 Jun 2007 18:42:58 +0000
Subject: [PATCH] xmlgeneric: Finalize gbfile membership.

---
 gpsbabel/xmlgeneric.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.c
index 2b8661d38..16aa6513f 100644
--- a/gpsbabel/xmlgeneric.c
+++ b/gpsbabel/xmlgeneric.c
@@ -30,7 +30,7 @@
 
 static vmem_t current_tag;
 static vmem_t cdatastr;
-static FILE *ifd;
+static gbfile *ifd;
 static xg_tag_mapping *xg_tag_tbl;
 static const char **xg_ignore_taglist;
 
@@ -266,8 +266,8 @@ void xml_read(void)
 	int len;
 	char buf[MY_CBUF];
 	
-	while ((len = fread(buf, 1, sizeof(buf), ifd))) {
-		if (!XML_Parse(psr, buf, len, feof(ifd))) {
+	while ((len = gbfread(buf, 1, sizeof(buf), ifd))) {
+		if (!XML_Parse(psr, buf, len, gbfeof(ifd))) {
 			fatal(MYNAME ":Parse error at %d: %s\n",
 				(int) XML_GetCurrentLineNumber(psr),
 				XML_ErrorString(XML_GetErrorCode(psr)));
@@ -307,7 +307,9 @@ void
 xml_init(const char *fname, xg_tag_mapping *tbl, const char *encoding)
 {
 	if (fname) {
-		ifd = xfopen(fname, "r", MYNAME);
+		ifd = gbfopen(fname, "r", MYNAME);
+	} else {
+		ifd = NULL;
 	}
 
 	current_tag = vmem_alloc(1,0);
@@ -334,7 +336,7 @@ xml_deinit(void)
 	vmem_free(&current_tag);
 	vmem_free(&cdatastr);
 	if (ifd) {
-		fclose(ifd);
+		gbfclose(ifd);
 		ifd = NULL;
 	}
 	xg_ignore_taglist = NULL;
-- 
2.30.2